acme-acme.sh: support --cert-profile option

acme 3.1.2 added a new --cert-profile option to request specific certificates.
This makes it possible to request shortlived six day certificates from Letsencrypt.

Signed-off-by: Norman Gehrsitz <openwrt@gehrsitz.eu>

diff --git a/net/acme-acmesh/Makefile b/net/acme-acmesh/Makefile
index 1b3937639936008c1f02ccb074a8f9f398a65c6a..c628852a83099cb3f369fdc4b2e94c19c186cc38 100644 (file)
--- a/net/acme-acmesh/Makefile
+++ b/net/acme-acmesh/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=acme-acmesh
-PKG_VERSION:=3.1.1
-PKG_RELEASE:=4
+PKG_VERSION:=3.1.2
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/acmesh-official/acme.sh/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=c5d623ac0af400e83cd676aefaf045228f60e9fc597fea5db4c3a5bd7f6bfcf4
+PKG_HASH:=a51511ad0e2912be45125cf189401e4ae776ca1a29d5768f020a1e35a9560186
 PKG_BUILD_DIR:=$(BUILD_DIR)/acme.sh-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Toke Høiland-Jørgensen <toke@toke.dk>

diff --git a/net/acme-acmesh/files/hook.sh b/net/acme-acmesh/files/hook.sh
index 1b6a04feaafbecdc67383ca20d4a28f1340ca6d2..d633029d419d7f70d762b86687dcfb54b2764403 100644 (file)
--- a/net/acme-acmesh/files/hook.sh
+++ b/net/acme-acmesh/files/hook.sh
@@ -156,6 +156,10 @@ get)
                set -- "$@" --days "$days"
        fi
 
+       if [ "$cert_profile" ]; then
+               set -- "$@" --cert-profile "$cert_profile"
+       fi
+
        case "$validation_method" in
        "dns")
                set -- "$@" --dns "$dns"

diff --git a/net/acme-common/Makefile b/net/acme-common/Makefile
index 4c7fe69f58692f3a496bd008a7ebe0df99c1a0f9..f07faa1fde60d6b5c45fb9f5020025e0591d91f8 100644 (file)
--- a/net/acme-common/Makefile
+++ b/net/acme-common/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=acme-common
-PKG_VERSION:=1.5.0
+PKG_VERSION:=1.5.1
 
 PKG_MAINTAINER:=Toke Høiland-Jørgensen <toke@toke.dk>
 PKG_LICENSE:=GPL-3.0-only

diff --git a/net/acme-common/files/acme.init b/net/acme-common/files/acme.init
index cb2b5505d2391e6e446c80e0186b0e46f904c2e6..b25384ef6d3be88dffb085aa829609793e4f2bfc 100644 (file)
--- a/net/acme-common/files/acme.init
+++ b/net/acme-common/files/acme.init
@@ -61,6 +61,8 @@ load_options() {
        procd_append_param env acme_server="$acme_server"
        config_get days "$section" days
        procd_append_param env days="$days"
+       config_get cert_profile "$section" cert_profile
+       procd_append_param env cert_profile="$cert_profile"
        config_get dns_wait "$section" dns_wait
        procd_append_param env dns_wait="$dns_wait"
        config_get webroot "$section" webroot